From a272e8333913685b4e277036002c9a5a7e54384d Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 13 Nov 2001 18:52:25 +0000 Subject: [PATCH] protect idle handle with gdk threads macro. Tue Nov 13 19:51:43 2001 Tim Janik * gtk/gtkwindow.c (handle_accels_changed): protect idle handle with gdk threads macro. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkwindow.c | 8 ++++++-- 8 files changed, 41 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 31c26db01a..f9b16a881e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Nov 13 19:51:43 2001 Tim Janik + + * gtk/gtkwindow.c (handle_accels_changed): protect idle handle + with gdk threads macro. + Mon Nov 12 23:08:37 2001 Tim Janik * gtk/maketypes.awk: fix type utils generation on unix. diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index d5b68cb0f5..7f8ce8602e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1015,7 +1015,10 @@ gtk_window_set_policy (GtkWindow *window, static gboolean handle_accels_changed (gpointer data) { - GtkWindow *window = GTK_WINDOW (data); + GtkWindow *window; + + GDK_THREADS_ENTER (); + window = GTK_WINDOW (data); if (window->accels_changed_handler) { @@ -1024,7 +1027,8 @@ handle_accels_changed (gpointer data) } g_signal_emit (window, window_signals[ACCELS_CHANGED], 0); - + GDK_THREADS_LEAVE (); + return FALSE; } -- 2.30.2